From e9fe9410e02ee627a932518dd992a36884d99a4b Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Thu, 29 Nov 2018 13:12:44 +0100 Subject: [PATCH] Adwaita: sync headerbar styling for devel mode --- gtk/theme/Adwaita/_common.scss | 13 +++++++++++-- gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 679fe2a0f9..fb7e20b333 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1730,8 +1730,17 @@ headerbar { // headerbar border rounding window.devel { headerbar.titlebar:not(.selection-mode) { - background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, - linear-gradient(to left, mix($selected_bg_color, $bg_color, 10%) 8%, $bg_color 25%); + $c: darken($bg_color, 10%); + $gradient: -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, + linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8)), + linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%)); + @if $variant == 'dark' { + $gradient: -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, + linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9)), + linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%)); + } + + background: transparent $gradient; color: transparentize($fg_color,.9); label { color: $fg_color; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 75ccfbc039..8b825b6dd7 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -698,7 +698,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .titlebar:not(headerbar) separator { background-color: #252526; } -window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #3b4049 8%, #3f3e40 25%); color: rgba(238, 238, 236, 0.1); } +window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(21, 83, 158, 0.1)), linear-gradient(to top, #2d2d2e 3px, #323233); color: rgba(238, 238, 236, 0.1); } window.devel headerbar.titlebar:not(.selection-mode) label { color: #eeeeec; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 40e3e5074a..28d17120ac 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -706,7 +706,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .titlebar:not(headerbar) separator { background-color: #d6d1cd; } -window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #e3eaf2 8%, #f6f5f4 25%); color: rgba(46, 52, 54, 0.1); } +window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(53, 132, 228, 0.2)), linear-gradient(to top, #d8d4d0, #dfdcd8 3px, #edebe9); color: rgba(46, 52, 54, 0.1); } window.devel headerbar.titlebar:not(.selection-mode) label { color: #2e3436; } -- 2.30.2